Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 31 Jan 2011 22:11:23 +0000 (14:11 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 31 Jan 2011 22:11:23 +0000 (14:11 -0800)

Trivial merge